From: John Wiegley <johnw@newartisans.com>
Date: Fri, 4 Mar 2016 07:53:26 +0000 (-0800)
Subject: Merge from origin/emacs-25
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~3413
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f991a50a90ca5317073f01ccff37ff5048b1881e;p=emacs.git

Merge from origin/emacs-25

5a44bfe Set auto-revert-use-notify to nil in global-auto-revert-mode.  (Bug#22814)
0d60bfc Fix ModelSim error parsing
---

f991a50a90ca5317073f01ccff37ff5048b1881e